-
Notifications
You must be signed in to change notification settings - Fork 11
Kanto fixes #9
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
M1L4
wants to merge
95
commits into
WiWi33:master
Choose a base branch
from
M1L4:KantoFixes
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Kanto fixes #9
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- added the loop detection to the case where bot wanted to switch out a lower leveled pkm
- Pokemon that created HealingLoops would be kept in team, but not leveled. This has been added now. - removed that obvious automated sorting. It now only check if starter is lowest and lst pkm is highest. Which result's in pretty much the same functionallity. - added team manager library from another project of mine. Which is utilized in former statements. It also allows future code reduction. [Todo] Cleanup - with the addition of team manager, many function can be freed from redundant code - also team managers leftover method supports multi-leftovers, so it's integration could be considered as well
- fixed a bad link name
- yet another bad name update from PRO - "Route 3" is labeled as "Link" now
- it was hard to revert back to a random selection, once set - at least for a none programmer. Random selection now is definable via nil value. - added other regional config elements | unsupported at the moment - added rod buying option - moved free rod action (now obtained earlier), to supplement further rod progression
- Catching Ditto - Farming in Seafoam Island until money reaches necessary amount, if selected - added methods to pc: + retrieveFirst(pkmName) + retrieveFirstBelowLvl(pkmName, lvl) + retrieveFirstWithMove(pkmName, move) + retrieveFirstWithMoveFrom(pkmName, move, region) [Fix] - Fixes done until SaffronGuardQuest, anything after should be the same as before
- for longer botting session nobody wants to be interrupted, so an disabling PM option has been added
- fixed a new added Bot, blocking Road leaving Cerulean City
- fixed an endless loop, when pre rod wasn't obtained
- clarified script description due to mix-ups
- added intend feature by mistake to sys.todo instead of sys.debug - this has now been fixed. [Refactoring] sys.debug - older debug values, were adjusted
- added a first working version, before opimization will require a refactoring
- relates to bike quest, because of the need to retrieve ditto, but came earlier chronologically - not working atm
- nice generic functionallity - disable leftover option - untested
- fixed an endless loop, when pre rod wasn't obtained
- added new Police Officer, blocking Road when leaving Cerulean City
- added new content to the readme file, explaining some basic github concepts for better user feedback
- fixed an issue, calculating the teamlevel when no pkm where in team yet
- Start Map would print non existing teammembers, when debug enabled, fixed - Additionally, debug modus now in config file settable - new generic approach to work with nil values for debug prints
- fixed a logic mistake in quest.needPokecenter()
- fixed Map Link to pro's new generic Link naming
- fixed an issue, where it wouldn't be tried to teach the 6th pkm surf
- fixed an issue, where the bot looped between Route8StopHouse and Route8: This was the cause, because Route8 was added as training zone. Originally bot would train in seafoam island and then fighting gym, never considering an actual loss. Since the zone was added, isDone() wouldn't return true in Route 8, so the bot now moves to Lavender Town for the ending of the quest
- the newly added bot, had a wrong position associated
- for longer botting session nobody wants to be interrupted, so an disabling PM option has been added
- corrected new Map Link Name after Update
- corrected new Map Link Name after Update from "Rock Tunnel 1" to "Link"
- a somehow working state, yet not working entirely [todo] - SoulBadgeQuest implement the list feature of the pclib
- switching now working as intended [todo] - matching isn't collecting the right pkm
- fixed an endless loop, when pre rod wasn't obtained
- relates to bike quest, because of the need to retrieve ditto, but came earlier chronologically - not working atm
- nice generic functionallity - disable leftover option - untested
- added same functionality of retrieving a surfer from pc as implemented for Ditto from BikeQuest or in the SoulBadgeQuest
- first bot that successfully achieved a bike - some smaller changes: fixed Map name link - removed sorting prints
- final issues has been solved: bot now retrieves the pkm stored, after obtaining the voucher
- removed very old bike quest code, apparently it was once located in johto
- different checks in Violet city and Route 32 caused this, should be fixed. Still needs some attention
- the original code checked if usable pkm count == 1. It happened that the last pkm had no more pp, therefore becoming unusable. Count became zero and Healing wouldn't be used
- B3F B4F Loop: replaced wrong logic - Nurse Fix: the original code checked if usable pkm count == 1. It happened that the last pkm had no more pp, therefore becoming unusable. Count became zero and Healing wouldn't be used
- the original's code segment not self.registeredPokecenter == "xxx" would never been true, since negation "not" is executed before comparison. so not nil is true and the actual comparison would be true == "xxx", which always fails
- the fix is already live for some time, but when lang.xml in resource folder was located, message Ids got replaced by the actual message. Added both id and message to trigger previous implemented behaviour
Merge remote-tracking branch 'origin/master' into bike * origin/master: (24 commits) [fix] noSwitch & noRun loops - the fix is already live for some time, but when lang.xml in resource folder was located, message Ids got replaced by the actual message. Added both id and message to trigger previous implemented behaviour [fix] not registering Pokecenter - the original's code segment not self.registeredPokecenter == "xxx" would never been true, since negation "not" is executed before comparison. so not nil is true and the actual comparison would be true == "xxx", which always fails [fix] Wouldn't use Nurse - the original code checked if usable pkm count == 1. It happened that the last pkm had no more pp, therefore becoming unusable. Count became zero and Healing wouldn't be used [fix] Route32 Loop | ZephyrBadgeQuest - different checks in Violet city and Route 32 caused this, should be fixed. Still needs some attention [Fix] StartJohtoQuest - removed very old bike quest code, apparently it was once located in johto [Fix] BolderBadgeQuest - Moving to fixed position instead of going to MapLink "Link", as they named jail's MapLink "Link" as well [Fix] CascadeBadge - fixed the newly added police officer bot, had a wrong position associated (again) [Fix] Route 18 Loop - when not able to enter safari, bot would go to route 18. Because of a wrong negation, bot would keep looping between Route 18 and Fuchsia City. - added moving to Pokecenter, if pokemon need healing [Fix] ColcanoBadgeQuest - fixed an issue, where when money wouldn't be enough a "compare bool to number" exception would be thrown (same as previously ExpForSaffronQuest) [Fix] ExpForSaffronQuest - fixed an issue, where when money wouldn't be enough a "compare bool to number" exception would be thrown [improvement] debuggin - as many aren't using git and only donwload the files via zip, it's hard to track the commit cycle they issue problems. As such i added an commitID in the readme file. Isn't nice, since I have to update it manually, but it will for the moment [Fix] RockTunnelQuest - corrected new Map Link Name after Update from "Rock Tunnel 1" to "Link" [Fix] MarshBadge - corrected new Map Link Name after Update [Feature] disabled PM - for longer botting session nobody wants to be interrupted, so an disabling PM option has been added [Fix] CascadeBadge - the newly added bot, had a wrong position associated [Fix] MarshBadge - fixed an issue, where the bot looped between Route8StopHouse and Route8: This was the cause, because Route8 was added as training zone. Originally bot would train in seafoam island and then fighting gym, never considering an actual loss. Since the zone was added, isDone() wouldn't return true in Route 8, so the bot now moves to Lavender Town for the ending of the quest [Fix] Route 19 SurfPkm - fixed an issue, where it wouldn't be tried to teach the 6th pkm surf [Fix] Link Update Route6StopHouse - fixed Map Link to pro's new generic Link naming [Fix] FUllHP loop - fixed a logic mistake in quest.needPokecenter() [Fix] DebugModus - Start Map would print non existing teammembers, when debug enabled, fixed - Additionally, debug modus now in config file settable - new generic approach to work with nil values for debug prints ... # Conflicts: # Libs/teamlib.lua # Questing.lua # Quests/Johto/StartJohtoQuest.lua # Quests/Kanto/ExpForSaffronQuest.lua # Quests/Kanto/MarshBadgeQuest.lua # Quests/Kanto/SoulBadgeQuest.lua # Quests/Kanto/ToCinnabarQuest.lua # Quests/Quest.lua # README.md # config.lua
- added going back to beach to initate ExpForSaffronQuest in SoulBadgeForm - additionally I moved the levels of 2 Quests up to compensate for disabled evolving
- removed potential loops between all Map switches
- issue #15: TrainerBattle | no action executed, switch in last pkm - issue description: #15 - corrected a wrong reference in game.useAnyMove(): iterator i was referenced as moveId [improvement] - massive code reduction and improved readabiltiy: - combined trainer and wild battles, as they were not handled differently, appart from catching - canRun & canSwitch were originally reset in onPathAction, making that function unnecessary complicated and confusing, moved that to onBattleMessage [testing] removed blacklist - temporarily removed blacklist, as I saw no meaning to it. If nurse loop now happens more frequently, it is probably to this. At which point the leveling function has to be adressed, not a blacklist. - allows catching following previously blacklisted pkm: - "Metapod", - "Kakuna", - "Doduo", - "Hoothoot", - "Zigzagoon" - necessary for e.g. pokedex completion
- after last fix, this issue was moved to a later state "when leaving after beaten gym", but should be completely fixed now
- branch: master - commitId: 13 - reason: for smooth testing & progressing - master resolved a issue where bot wouldn't perform a action during battle, which was added as well as other smaller fixes up to date Merge remote-tracking branch 'origin/master' into bike * origin/master: [fix] Route 32 Loop - after last fix, this issue was moved to a later state "when leaving after beaten gym", but should be completely fixed now [fix] no BattleAction - issue #15: TrainerBattle | no action executed, switch in last pkm - issue description: #15 # Conflicts: # Quests/Quest.lua # README.md
- after last fix, this issue was moved to a later state "when leaving after beaten gym", but should be completely fixed now
- A few commits ago, I replaced an invalid pokecenter register comparison (not self.registerdPkmCenter == "CityName"), which never could be fullfilled. Since this statement was never considered before, but as it is now working, it created a loop between violet city's and route 32's Pokecenter. This shoule be resolved now
- added escape ropes to be buyed, to escape from jails (apparently working, but needs verification) and future uses of shortcutting
- I thought proShine prevented that. I got that assumption from silv3r when he mentioned, that run() in trainer battles would simple return false and calling it during trainer battles wouldn't be an issue. So I didn't especially check for that. Should be fixed now.
- removed escape rope from the buyable items, since this created an error. Will try to add them in the future though.
- branch: bikeQuest - commitId: 8 - reason: little feedback about any open issues, so there might be none (That is very unlikely xD) Merge remote-tracking branch 'origin/bikeQuest' * origin/bikeQuest: (53 commits) [fix] Route 32 Loop - after last fix, this issue was moved to a later state "when leaving after beaten gym", but should be completely fixed now [Fix] ExpForSaffronQuest - removed potential loops between all Map switches [improvement] unfinished ExpForSaffronQuest - added going back to beach to initate ExpForSaffronQuest in SoulBadgeForm - additionally I moved the levels of 2 Quests up to compensate for disabled evolving [fix] Seafoam Island - B3F B4F Loop: replaced wrong logic - Nurse Fix: the original code checked if usable pkm count == 1. It happened that the last pkm had no more pp, therefore becoming unusable. Count became zero and Healing wouldn't be used [Feature] BikeQuest finalized - final issues has been solved: bot now retrieves the pkm stored, after obtaining the voucher [Fix] MapLinkName Saffron Stop House - first bot that successfully achieved a bike - some smaller changes: fixed Map name link - removed sorting prints [Fix] - Merged Fixes from master, prey this works xD [improvement] automated surfer for CinnarbarQuest - added same functionality of retrieving a surfer from pc as implemented for Ditto from BikeQuest or in the SoulBadgeQuest code cleaned [attempt] -2- automated get surfer - nice generic functionallity - disable leftover option - untested [attempt] automated get surfer - relates to bike quest, because of the need to retrieve ditto, but came earlier chronologically - not working atm [Fix] Rods - fixed an endless loop, when pre rod wasn't obtained [Fix] BolderBadgeQuest - Moving to fixed position instead of going to MapLink "Link", as they named jail's MapLink "Link" as well [Fix] CascadeBadge - fixed the newly added police officer bot, had a wrong position associated (again) [Fix] ExpForSaffronQuest - fixed an issue, where when money wouldn't be enough a "compare bool to number" exception would be thrown [Fix] CascadeBadge - the newly added bot, had a wrong position associated [Fix] Route 19 SurfPkm - fixed an issue, where it wouldn't be tried to teach the 6th pkm surf [Fix] Cerulean City - added new Police Officer, blocking Road when leaving Cerulean City [Fix] Rods - fixed an endless loop, when pre rod wasn't obtained [Improvement] - added commitId and update time to readme file. Correlated to: https://proshine-bot.com/thread-2641.html ... # Conflicts: # Quests/Johto/ZephyrBadgeQuest.lua # Quests/Quest.lua # README.md
- renamed a method to fit into the overall interface format and apparantly forgot to fix references. Corrected now. [improvement] getLowestLevel - reduced redundancies: removed calculation and instead returns a modified output of another method.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
[done]
[open]
still:
additionally: